From 73b87afff20adaedf8f5efc68b2c9ad4506baf10 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 18 Mar 2008 15:03:43 +0000 Subject: [PATCH] p2m: hap enabled/supported fix Check for per domain hap_enabled rather than hvm_funcs hap_supported, in case hap has been disabled. Alleviates problem booting >=4Gig shadow HVM guests on PAE hypervisor on AMD-V platforms. Signed-off-by: Tom Woller --- xen/arch/x86/mm/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e37b9508e3..e8298fb3bd 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -229,7 +229,7 @@ set_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, p2m_type_t p2mt) if ( !p2m_next_level(d, &table_mfn, &table, &gfn_remainder, gfn, L3_PAGETABLE_SHIFT - PAGE_SHIFT, ((CONFIG_PAGING_LEVELS == 3) - ? (hvm_funcs.hap_supported ? 4 : 8) + ? (d->arch.hvm_domain.hap_enabled ? 4 : 8) : L3_PAGETABLE_ENTRIES), PGT_l2_page_table) ) goto out; -- 2.30.2